Implement RFC 3184 - thread local cell methods #92123

m-ou-se · 2021-12-20T12:50:50Z

This implements RFC 3184, with @danielhenrymantilla's suggestion for the with_ method names.

Tracking issue: #92122

rust-highfive · 2021-12-20T12:50:53Z

(rust-highfive has picked a reviewer for you, use r? to override)

danielhenrymantilla

Nice! Note that I got a bit confused by the nested Option dance at the beginning, hence some extra comments and renames, but nothing paramount.

library/std/src/thread/local.rs

m-ou-se · 2021-12-20T18:25:32Z

@danielhenrymantilla Thanks for the review!

library/std/src/thread/local.rs

m-ou-se · 2022-01-05T12:36:12Z

This is bocked on an issue with the CI/test runner, where a large output from rustc gets trimmed and <<<<<< SKIPPED 246746 BYTES >>>>>> injected, which results in invalid json, breaking things. See the failed test run: https://github.com/rust-lang/rust/runs/4586149338?check_suite_focus=true

apiraino · 2022-02-24T11:08:12Z

@m-ou-se checking in for this PR: is the CI issue you mention being taken care in some place? thanks.

If it's fine, I'd temporarily remove the s-waiting-on-review label until the CI issue is solved.

@rustbot label -S-waiting-on-review

m-ou-se · 2022-02-24T13:50:21Z

is the CI issue you mention being taken care in some place?

I filed an issue for it: #94322

Thanks for the reminder.

…etrochenkov Avoid emitting full macro body into JSON errors While investigating rust-lang#94322, it was noted that currently the JSON diagnostics for macro backtraces include the full def_site span -- the whole macro body. It seems like this shouldn't be necessary, so this PR adjusts the span to just be the "guessed head", typically the macro name. It doesn't look like we keep enough information to synthesize a nicer span here at this time. Atop rust-lang#92123, this reduces output for the src/test/ui/suggestions/missing-lifetime-specifier.rs test from 660 KB to 156 KB locally.

bors · 2022-02-27T03:52:15Z

☔ The latest upstream changes (presumably #94373) made this pull request unmergeable. Please resolve the merge conflicts.

m-ou-se · 2022-03-02T18:25:40Z

@joshtriplett The CI issue has been fixed, so this is now ready for review.

joshtriplett · 2022-03-05T08:46:17Z

@bors r+

bors · 2022-03-05T08:46:19Z

📌 Commit e602beff3293960273780440b63240be5568441c has been approved by joshtriplett

m-ou-se · 2022-03-05T13:23:06Z

@bors r=joshtriplett

bors · 2022-03-05T13:23:08Z

📌 Commit a6e7f26 has been approved by joshtriplett

bors · 2022-03-05T13:54:47Z

⌛ Testing commit a6e7f26 with merge 35d2d53a0ecf89712d3378790151a186fe4f6379...

rust-log-analyzer · 2022-03-05T14:31:44Z

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)




The actual stderr differed from the expected stderr.
Actual stderr saved to /tmp/compiletestTtXhmV/available-concurrency.stage-id.stderr
To only update this specific test, also pass `--test-args available-concurrency.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/available-concurrency.rs" "-L" "/tmp/compiletestTtXhmV" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestTtXhmV/available-concurrency.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-L" "/tmp/compiletestTtXhmV/available-concurrency.stage-id.aux"
------------------------------------------

------------------------------------------
stderr:
---
......... (50/60)
.......... (60/60)


/checkout/src/test/rustdoc-gui/toggled-open-implementations.goml An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!


TROUBLESHOOTING: https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md
== STACKTRACE ==
Error
Error
    at innerRunTestCode (/node-v14.4.0-linux-x64/lib/node_modules/browser-ui-test/src/index.js:468:16)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)

bors · 2022-03-05T14:32:16Z

💔 Test failed - checks-actions

m-ou-se · 2022-03-05T14:54:34Z

@bors retry

bors · 2022-03-05T17:13:06Z

⌛ Testing commit a6e7f26 with merge ab2bd41...

bors · 2022-03-05T19:53:40Z

☀️ Test successful - checks-actions
Approved by: joshtriplett
Pushing ab2bd41 to master...

rust-timer · 2022-03-05T21:46:27Z

Finished benchmarking commit (ab2bd41): comparison url.

Summary: This benchmark run did not return any relevant results. 37 results were found to be statistically significant but too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

rust-highfive assigned joshtriplett Dec 20, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 20, 2021

m-ou-se mentioned this pull request Dec 20, 2021

Tracking issue for thread local Cell methods #92122

Closed

4 tasks

danielhenrymantilla approved these changes Dec 20, 2021

View reviewed changes

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 20, 2021

danielhenrymantilla reviewed Dec 20, 2021

View reviewed changes

library/std/src/thread/local.rs Show resolved Hide resolved

JohnCSimon added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Jan 23, 2022

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 24, 2022

m-ou-se mentioned this pull request Feb 24, 2022

compiletest's 'SKIPPED 246746 BYTES' logic breaks tests #94322

Closed

m-ou-se force-pushed the thread-local-cell-methods branch from 50e6b83 to 363833b Compare February 24, 2022 14:49

Mark-Simulacrum mentioned this pull request Feb 24, 2022

Avoid emitting full macro body into JSON errors #94327

Merged

m-ou-se force-pushed the thread-local-cell-methods branch from 363833b to 41248d5 Compare February 28, 2022 11:08

This comment has been minimized.

Sign in to view

m-ou-se force-pushed the thread-local-cell-methods branch from 41248d5 to e602bef Compare February 28, 2022 15:14

m-ou-se added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 2, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2022

m-ou-se added 7 commits March 5, 2022 11:39

Implement RFC 3184 - thread local cell methods.

52ce119

Rename LocalKey's with_{ref,mut} to with_borrow{,_mut}.

88a693c

Add tracking issue number for local_key_cell_methods.

93c409d

Add debug asserts in thread local cell set methods.

36c9045

Update documentation in thread/local.rs.

c68c384

Small fixes in thread local code.

3b9e214

Update tests.

a6e7f26

m-ou-se force-pushed the thread-local-cell-methods branch from e602bef to a6e7f26 Compare March 5, 2022 10:39

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 5, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2022

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 5, 2022

bors merged commit ab2bd41 into rust-lang:master Mar 5, 2022

rustbot added this to the 1.61.0 milestone Mar 5, 2022

m-ou-se deleted the thread-local-cell-methods branch March 6, 2022 08:05

Mark-Simulacrum mentioned this pull request Apr 16, 2022

regression: TLS linker issues #96132

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement RFC 3184 - thread local cell methods #92123

Implement RFC 3184 - thread local cell methods #92123

m-ou-se commented Dec 20, 2021 •

edited

Loading

rust-highfive commented Dec 20, 2021

danielhenrymantilla left a comment •

edited

Loading

m-ou-se commented Dec 20, 2021

m-ou-se commented Jan 5, 2022

apiraino commented Feb 24, 2022 •

edited

Loading

m-ou-se commented Feb 24, 2022

bors commented Feb 27, 2022

This comment has been minimized.

m-ou-se commented Mar 2, 2022

joshtriplett commented Mar 5, 2022

bors commented Mar 5, 2022

m-ou-se commented Mar 5, 2022

bors commented Mar 5, 2022

bors commented Mar 5, 2022

rust-log-analyzer commented Mar 5, 2022

bors commented Mar 5, 2022

m-ou-se commented Mar 5, 2022

bors commented Mar 5, 2022

bors commented Mar 5, 2022

rust-timer commented Mar 5, 2022

Implement RFC 3184 - thread local cell methods #92123

Implement RFC 3184 - thread local cell methods #92123

Conversation

m-ou-se commented Dec 20, 2021 • edited Loading

rust-highfive commented Dec 20, 2021

danielhenrymantilla left a comment • edited Loading

Choose a reason for hiding this comment

m-ou-se commented Dec 20, 2021

m-ou-se commented Jan 5, 2022

apiraino commented Feb 24, 2022 • edited Loading

m-ou-se commented Feb 24, 2022

bors commented Feb 27, 2022

This comment has been minimized.

m-ou-se commented Mar 2, 2022

joshtriplett commented Mar 5, 2022

bors commented Mar 5, 2022

m-ou-se commented Mar 5, 2022

bors commented Mar 5, 2022

bors commented Mar 5, 2022

rust-log-analyzer commented Mar 5, 2022

bors commented Mar 5, 2022

m-ou-se commented Mar 5, 2022

bors commented Mar 5, 2022

bors commented Mar 5, 2022

rust-timer commented Mar 5, 2022

m-ou-se commented Dec 20, 2021 •

edited

Loading

danielhenrymantilla left a comment •

edited

Loading

apiraino commented Feb 24, 2022 •

edited

Loading